HSV and test: minor style cleaning before merge

diff --git a/extensions/HSV.c b/extensions/HSV.c
index a4727ff1d25d95c857c9f71d872cbaff85cabe6c..d4cf4c4b04baeb8f1766a03c4f94435d55caad0c 100644 (file)
--- a/extensions/HSV.c
+++ b/extensions/HSV.c
@@ -101,7 +101,7 @@ rgba_to_hsva (char *src,
     double  min;
     double  chroma;
 
-     if (red > green)
+    if (red > green)
     {
       value = MAX (red, blue);
       min = MIN (green, blue);
@@ -128,7 +128,7 @@ rgba_to_hsva (char *src,
       if (red == value)
       {
         hue = (green - blue) / chroma;
-        
+
         if(hue < 0.0)
           hue += 6.0;
       }

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 177605018b282cefa0a97c23d5886114bd450bfd..3a38e51ad8bd19280adac86bb60ea752d9835ffe 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,7 +12,7 @@ C_TESTS =                             \
        extract \
        floatclamp \
        float-to-8bit \
-        hsva   \
+       hsva   \
        types                   \
        palette \
        extract \

diff --git a/tests/hsva.c b/tests/hsva.c
index d04172f9f2d2f1a3ff5a828d2e990b7417270419..ef5c111283001bd0800d62b9ebf16b393a2cb38b 100644 (file)
--- a/tests/hsva.c
+++ b/tests/hsva.c
@@ -60,14 +60,14 @@ main (int    argc,
 {
   int OK = 1;
 
-  float rgba[][4] = {{    1.0,   1.0,   1.0, 1.0 }, {  0.5,   0.5,   0.5, 1.0}, {  0.0,   0.0,   0.0, 1.0},
+  float rgba[][4] = {{  1.0,   1.0,   1.0, 1.0 }, {  0.5,   0.5,   0.5, 1.0}, {  0.0,   0.0,   0.0, 1.0},
                     {   1.0,   0.0,   0.0, 1.0 }, { 0.75,  0.75,   0.0, 1.0}, {  0.0,   0.5,   0.0, 1.0},
                     {   0.5,   1.0,   1.0, 1.0 }, {  0.5,   0.5,   1.0, 1.0}, { 0.75,  0.25,  0.75, 1.0},
                     { 0.628, 0.643, 0.142, 1.0 }, {0.255, 0.104, 0.918, 1.0}, {0.116, 0.675, 0.255, 1.0},
                     { 0.941, 0.785, 0.053, 1.0 }, {0.704, 0.187, 0.897, 1.0}, {0.931, 0.463, 0.316, 1.0},
                     { 0.998, 0.974, 0.532, 1.0 }, {0.099, 0.795, 0.591, 1.0}, {0.211, 0.149, 0.597, 1.0}};
 
-float hsva[][4]  = {{      0.0,   0.0,   1.0, 1.0 }, {    0.0,   0.0,   0.5, 1.0}, {    0.0,   0.0,   0.0, 1.0},
+  float hsva[][4] = {{    0.0,   0.0,   1.0, 1.0 }, {    0.0,   0.0,   0.5, 1.0}, {    0.0,   0.0,   0.0, 1.0},
                     {     0.0,   1.0,   1.0, 1.0 }, {   60.0,   1.0,  0.75, 1.0}, {  120.0,   1.0,   0.5, 1.0},
                     {   180.0,   0.5,   1.0, 1.0 }, {  240.0,   0.5,   1.0, 1.0}, {  300.0, 0.666,  0.75, 1.0},
                     {  61.796, 0.779, 0.643, 1.0 }, {251.130, 0.887, 0.918, 1.0}, {134.919, 0.828, 0.675, 1.0},
@@ -77,19 +77,19 @@ float hsva[][4]  = {{      0.0,   0.0,   1.0, 1.0 }, {    0.0,   0.0,   0.5, 1.0
 
   babl_init ();
 
-  {
-    CHECK_CONV("rgba to hsva ", float,
-        babl_format("RGBA float"),
-        babl_format("HSVA float"),
-        rgba, hsva);
-  }
 
-  {
-    CHECK_CONV("hsva to rgba ", float,
-        babl_format("HSVA float"),
-        babl_format("RGBA float"),
-        hsva, rgba);
-  }
+  CHECK_CONV("rgba to hsva ", float,
+      babl_format("RGBA float"),
+      babl_format("HSVA float"),
+      rgba, hsva);
+
+
+
+  CHECK_CONV("hsva to rgba ", float,
+      babl_format("HSVA float"),
+      babl_format("RGBA float"),
+      hsva, rgba);
+
 
   babl_exit ();
   return !OK;